From 8ccd6cba27319ccb9c86af6a616886fb1e115684 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 4 Feb 2005 18:13:05 +0000 Subject: [PATCH] Handle item->translation_domain being NULL. (#166179, Diego Gonzalez) 2005-02-04 Matthias Clasen * gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain being NULL. (#166179, Diego Gonzalez) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkstock.c | 9 ++++++--- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c2ff2b33b..d276ce6766 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-04 Matthias Clasen + + * gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain + being NULL. (#166179, Diego Gonzalez) + 2005-02-04 Owen Taylor * configure.in: Revert gtk_binary_version to 2.4.0. Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8c2ff2b33b..d276ce6766 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-02-04 Matthias Clasen + + * gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain + being NULL. (#166179, Diego Gonzalez) + 2005-02-04 Owen Taylor * configure.in: Revert gtk_binary_version to 2.4.0. Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8c2ff2b33b..d276ce6766 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-02-04 Matthias Clasen + + * gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain + being NULL. (#166179, Diego Gonzalez) + 2005-02-04 Owen Taylor * configure.in: Revert gtk_binary_version to 2.4.0. Fix diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c index 606df1b300..60fd3ecb42 100644 --- a/gtk/gtkstock.c +++ b/gtk/gtkstock.c @@ -166,9 +166,12 @@ gtk_stock_lookup (const gchar *stock_id, if (item->label) { GtkStockTranslateFunc *translate; - - translate = (GtkStockTranslateFunc *) - g_hash_table_lookup (translate_hash, item->translation_domain); + + if (item->translation_domain) + translate = (GtkStockTranslateFunc *) + g_hash_table_lookup (translate_hash, item->translation_domain); + else + translate = NULL; if (translate != NULL && translate->func != NULL) item->label = (* translate->func) (item->label, translate->data); -- 2.30.2